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