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