merge fuse_2_5_bugfix
2 files changed