Back inline with master (Update to 0.9)

This should be ``0.85``