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