Merge branch 'release-0.3.2' into develop
Fix events exception raising when ensuring server. Closes #3515.
Merge remote-tracking branch 'drebs-github/bug/3515_events-server-test-fails' into develop
Fold in changes.
Merge branch 'release-0.3.3'