Merge branch 'release/v2.0.4' into develop
Merge branch 'hotfix/v2.0.5' into develop
Add travis to my fork.
Add travis to my fork.