Add dev-200 branch to travis whitelist
Merge branch 'master' into dev