Free the name if it's been allocated
Merge remote-tracking branch 'origin/0.98' into 0.98