Merge branch 'master' into develop
[ignore]
[Travis] missing language:
Merge branch 'develop'