Merge in fix from master