Merge Summer 2014 changes with Summer 2013/Spring 2014