Updated for 0.9.7.11 release