2.5.22
Merge pull request #2 from malles/master

2.5.22