caligin Merge branch 'brydoncheyney:git-user'

Latest commit 1b9cbf8

Dec 16, 2017