Merge tag '0.13.2'