Merged changes from wp.lo on $s