Merge branch 'master' into mirio/balance
authorMirio <opivy@hotmail.de>
Sat, 5 Mar 2016 13:36:10 +0000 (14:36 +0100)
committerMirio <opivy@hotmail.de>
Sat, 5 Mar 2016 13:36:10 +0000 (14:36 +0100)

Trivial merge