Merge release 0.8.5 from master

Sending from my branch since there were merge conflicts in package.json.