restrict travis to master only to avoid double testing of six branch with pullrequest
Merge branch 'master' into six