Updated to commit v2.0.0-0-g71e969e