Fix travis build
Merge branch 'master' into reg-overhaul