Missed a unicode conversion
Merge remote-tracking branch 'origin/develop' into unicode-foible
Fix unbound local
Minor Vagrant refactoring