Merging in a fix from master