updating PR with the latest from develop after 2.5.2, solving conflits generated by the hook system.
updating PR with the latest from develop after 2.5.2, solving conflits generated by the hook system.

zhouyaoji/mojito-cli-start,yahoo/mojito-cli-start