Merge branch 'fix-file-locking'.
authorDaniel Carl <danielcarl@gmx.de>
Sun, 1 Nov 2015 21:50:12 +0000 (22:50 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Sun, 1 Nov 2015 21:50:12 +0000 (22:50 +0100)

Trivial merge