Merge pull request #1169 from sjinks/compiler-warnings

Fix compiler warnings
Merge remote-tracking branch 'upstream/1.3.0' into valgrind