More 0.9.0 compatibility changes. Version bump to  0.9.5.15