bump to 0.8.5

merge & reverse merge from master