Merge branch 'hotfix/1402985088'
update travis/packages
Merge branch 'hotfix/1402985559' into develop