Merge branch 'master' into matthiaskrgr/SE
authorMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:02:58 +0000 (17:02 +0100)
committerMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:02:58 +0000 (17:02 +0100)

Trivial merge