Merge branch 'wak-google-upstream1' (#223)
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>
Tue, 22 Nov 2016 15:25:24 +0000 (17:25 +0200)
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>
Tue, 22 Nov 2016 15:25:24 +0000 (17:25 +0200)

Trivial merge