Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki
authorBernie Innocenti <codewiz@google.com>
Sun, 15 Jul 2018 14:58:55 +0000 (23:58 +0900)
committerBernie Innocenti <codewiz@google.com>
Sun, 15 Jul 2018 14:58:55 +0000 (23:58 +0900)

Trivial merge