Merge branch 'travis' into bootstrap
Merge branch 'bootstrap' into develop