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