merge 7dbed3d9102b590105166153ca6b8b31239f9849 to eb7985fd8cbb91c005460a43c249f4b112c80400 (from 1.0)