Changes to 'refs/tags/sanlock-1.4'