Merge remote-tracking branch 'upstream/stable' into stable
Forgot to increase version
Merge pull request #19 from kmarty/stable

Forgot to increase version