pre-merge commit
Merge branch 'master' of https://github.com/rmoe88/lfs_sopen

Conflicts:
	backend.cpp
Merge branch 'master' of https://github.com/rmoe88/lfs_sopen

Conflicts:
	backend.cpp