This merges PR#429 with only small history cleanup (no code changes),
and ABI bump.

Closes #355, #358 and #429.