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