Merged changes from wp.lo on 10.17.2014