Merge branch '1534_cool_cooledit'