backport license fix to 0.6.x