Changes applied 2014-11-10 (Part 2)