Update master for release 0.9.1