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