Add whitelist to travis
Merge branch 'master' into py3