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