Fix compilation warnings

Marco Cattaneorequested to merge
cherry-pick-2efb6f0e-2 into 2016-patches

Exposed by change in compilation flags in the nightlies (cherry picked from commit 4a769e1d)

Merge request reports