Fix gulp error on build
Merge branch 'develop'