Travis, please be quiet
Merge branch 'master' into enhance-add_tests