Merge branch 'master' of https://github.com/jhatch/diplo
Merge branch 'master' of https://github.com/jhatch/diplo