Avoid compiler errors and enforce all warnings/errors.
Paul Jensen [Tue, 2 Feb 2016 11:18:40 +0000 (11:18 +0000)]
am: 51d3c5fa9c

* commit '51d3c5fa9c0ad7dd551c05b06a62ecec09c029d8':
  Avoid compiler errors and enforce all warnings/errors.


Trivial merge