Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords
authorMichael Vogel <ike@pirati.ca>
Thu, 15 Sep 2016 09:56:39 +0000 (09:56 +0000)
committerMichael Vogel <ike@pirati.ca>
Thu, 15 Sep 2016 09:56:39 +0000 (09:56 +0000)

Trivial merge