Merge tag '0.10.2'