Manual Merge

A git bug caused an incorrect merge. Manually merging things over.