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

Trivial merge