fixes #88
Merge branch 'release-3.3'