Merge remote-tracking branch 'mozilla/master' into 948240-reformat-response

Conflicts:
	samples/zippy-basic.py