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