Revert "Revert "Merge pull request #64 from enyojs/20140418-build-5.0-013-RC""

This reverts commit 870f689e8fb63fcf47a56e13c41263227e295832.

We are now ready to take this change for the next rc-21.