Merge branch 'jk/flockfile-stdio'