Merge remote-tracking branch 'origin/master' into amj60
authorToni <jeder@mail1a.de>
Fri, 19 Aug 2016 07:49:56 +0000 (09:49 +0200)
committerToni <jeder@mail1a.de>
Fri, 19 Aug 2016 07:49:56 +0000 (09:49 +0200)
merge with upstream


Trivial merge