Merge pull request #9 from adriaanm/2.9.x

2.9.3-RC2
Merge pull request #11 from adriaanm/2.9.x

2.9.3-RC2
2.9.3-RC2