pull in changes from 0.11.11.8 maintenence release