Fold in changes and update dependencies
Merge branch 'release-0.3.5'