Resolve conflicts between my 2.1.2 branch and gurdotan:requirejs2.1.2