Merge pull request #293 from afrjorge/require-js

Cherry-pick master branch commits made after require-js branch creation until present date