Merged angular1.2 branch into master.