Merge branch 'master' into mirio/fuse
authorMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:11:13 +0000 (18:11 +0100)
committerMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:11:13 +0000 (18:11 +0100)

Trivial merge