Fixes #25.
Merge branch 'master' into stash/3.x