Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords
authorMichael Vogel <icarus@dabo.de>
Fri, 24 Jun 2016 07:40:12 +0000 (09:40 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 24 Jun 2016 07:40:12 +0000 (09:40 +0200)

Trivial merge