Merge tag '0.3' into develop