Pushing fixes that will be merged back into 0.9.5.