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