Re-syncing develop and master

The true v0.33.1 release was made on **master**, so bringing the branches back into sync.