Nov12

Creating pull request for code review. See comments in diff.
Again, not needed.