Bump version to 0.3.3
Merge release 0.3.3 into master
Backported release 0.3.3 into develop