Merge commit 'sebastian/mlockall'