Merge branch 'master' into gsoc-ifdef-cleanup