Merged changes from wp.lo on 06.12.2014