fix travis
Merge branch 'staging'