Merge branch 'master' of https://github.com/angular/angular.js into patch-1