Merge branch '0.3.0' (fixup minor 0.3.0 mistag)