rake build 'env' option added
Merge branch 'master' into no-bundler-setup