this is cleaner.
-Werror
Merge branch 'kamikaze'