Merge branch 'master' into kuniuthefrogg/boil
authorMirio <opivy@hotmail.de>
Tue, 17 Jan 2017 14:19:49 +0000 (15:19 +0100)
committerMirio <opivy@hotmail.de>
Tue, 17 Jan 2017 14:19:49 +0000 (15:19 +0100)

Trivial merge