fix https://github.com/ecomfe/edp/issues/223
Merge branch '1.0.0-dev' of github.com:ecomfe/edp-build into 1.0.0-dev