Update to 0.8.6 dev 2