Added changes so far for 0.8.5.