Fixed travis-ci secrets
Merge branch 'master' into 3.2.0