Merge branch 'hotfix-from-SRombauts'
Merge branch 'release-0.5.1'
Merge branch 'feature-travis-ci'
add some messages and use ON instead of TRUE
Merge branch 'hotfix-travis-cxx11' into develop