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