Merge branch 'release/1402984424'
fix script/travis/packages
Merge branch 'hotfix/1402984762' into develop