Merged existing code from http://wp.lo

	Conflict: wp-content/plugins/gitium [local version]