Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords
authorMichael Vogel <ike@pirati.ca>
Sat, 8 Oct 2016 21:44:13 +0000 (21:44 +0000)
committerMichael Vogel <ike@pirati.ca>
Sat, 8 Oct 2016 21:44:13 +0000 (21:44 +0000)

Trivial merge