Merge develop into master
[skip ci]
Configure travis to build only for master
[ci skip]
Merge branch 'master' into develop