Refactoring/small corrections to fix warnings from clang -fsanitize=undefined 'member call on null pointer'
Merge remote-tracking branch 'upstream/master' into travis_advanced
gcc foo