Merged existing code from http://wp.lo

	Conflict: wp-content/plugins/git-sauce [local version]