Merge branch 'master' into 2.0
Update travis
Merge branch '2.0'