Merge branch 'master' into trac-28709

Conflicts:
	src/wp-admin/js/customize-controls.js
	src/wp-includes/class-wp-customize-control.php