Merge branch 'release-1.3.3'. Fixes #80