Merge branch 'master' into kuniuthefrogg/boil
authorMirio <opivy@hotmail.de>
Mon, 16 Jan 2017 16:57:23 +0000 (17:57 +0100)
committerMirio <opivy@hotmail.de>
Mon, 16 Jan 2017 16:57:23 +0000 (17:57 +0100)

Trivial merge