Merge branch 'master' into kuniuthefrogg/boil
authorMirio <opivy@hotmail.de>
Wed, 23 Nov 2016 15:47:03 +0000 (16:47 +0100)
committerMirio <opivy@hotmail.de>
Wed, 23 Nov 2016 15:47:03 +0000 (16:47 +0100)

Trivial merge