Force rebuild on travis with empty commit
Merge branch 'master' into develop