Merge remote-tracking branch 'upstream/develop' into develop
authorgerhard6380 <gerhard@seeber.at>
Fri, 23 Sep 2016 17:34:57 +0000 (19:34 +0200)
committergerhard6380 <gerhard@seeber.at>
Fri, 23 Sep 2016 17:34:57 +0000 (19:34 +0200)

Trivial merge