Merged changes from wp.lo on 10.16.2014