Merge r1754 from dispcalGUI SVN