Enable 2.9 branch, closes #11