Merged changes from http://wp.lo on 06.13.2014

	Conflict: .maintenance [added]