Merged 'requirejs_unexpected_token' of git://github.com/arosboro/calipso into arosboro-requirejs_unexpected_token

Merged manually to remove additional code changes which had no functionality changes.