Merging master - require.js