merge diffs from develop to upgrade-angularjs branch