Merge remote-tracking branch 'github/master' into jsonp_callback

Conflicts:
	src/ng/httpBackend.js