Merge branch 'master' into travis.linux
Merge branch 'master' into travis.linux
Merge branch 'master' into travis.linux
Merge branch 'travis.linux' into update.linux