Merged changes from wp.lo on 06.10.2014