Merge branch 'master' into mirio/fuse
authorMirio <opivy@hotmail.de>
Fri, 15 Jan 2016 15:42:20 +0000 (16:42 +0100)
committerMirio <opivy@hotmail.de>
Fri, 15 Jan 2016 15:42:20 +0000 (16:42 +0100)

Trivial merge