5b028f527f
(Commit also includes lots of changes to remove '.'s that a git merge messed up, or else it was monkeys.)
(Commit also includes lots of changes to remove '.'s that a git merge messed up, or else it was monkeys.)