added staff for https://travis-ci.org
Merge branch 'master' into develop