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