upstream merge
Merge branch 'grumplet' of github.com:gmp26/angular.js into grumplet
coding cuisenaire