Perhaps we should make a 0.0.7 release before merging so that we can get this fix out for everyone.