Merge tag '1.0.16' into develop

合并1.0.16