Don't recurse into self, fixes #250
Merge branch 'release-3.3.2'