Merge angular1.2 branch to master