Merge branch 'hotfix/0.20.15'
Update Travis badges
Merge branch 'hotfix/0.20.16' into develop