Updated for 0.9.7.15 release