Merge branch 'master' into maddin/shader-weapclip 54/head
authorMirio <opivy@hotmail.de>
Thu, 30 Mar 2017 17:50:27 +0000 (19:50 +0200)
committerMirio <opivy@hotmail.de>
Thu, 30 Mar 2017 17:50:27 +0000 (19:50 +0200)

Trivial merge