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