Merge pull request #577 from herby/requirejs-wip

Merging master