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

Trivial merge