Update dev with release branch changes

That looks a little bit awkward (even if #99 was already merged into `dev`) since we did not rebase the `fix-` branch against `master` before pulling it into both  branches.

This changed the `sha` of the fix.

Anyway, should be fine, isn't it?