Added changes for 0.8.6.