Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	js/ext/angular/src/directive/ionicViewState.js