Merge remote branch 'martins/warnings'