Merging release 0.8.5 branch to master