backport to 2.6
Merge branch 'master' of https://github.com/OpenSight/StorLever