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