#28: Merge require.js support