Version bump to 0.85.
merge latest from master