Yeah, we don't like compiler warnings around here.
Merge branch 'fix/compiler_warnings' into develop