Merged faulty Blog PageTool patch from 2 weeks ago.