Merge branch '1885_autopoint_without_cvs'