Merge branch 'warnings'