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