Merge remote-tracking branch 'refs/remotes/joan2937/master'
authorBjoernSch <mail@bjoern-schrader.de>
Wed, 3 Aug 2016 13:59:42 +0000 (15:59 +0200)
committerBjoernSch <mail@bjoern-schrader.de>
Wed, 3 Aug 2016 13:59:42 +0000 (15:59 +0200)

Trivial merge