Merge branch 'master' into feature-add-git-timemachine

This commit is contained in:
Henrik Lissner 2017-04-27 18:08:33 -04:00 committed by GitHub
commit 6efaf8987f
9 changed files with 204 additions and 68 deletions