Merge branch 'master' into 4232-slow-pipes-n-jobs
authorPhil Hodgson <bitbucket@philhodgson.net>
Mon, 26 Jan 2015 15:08:47 +0000 (16:08 +0100)
committerPhil Hodgson <bitbucket@philhodgson.net>
Mon, 26 Jan 2015 15:08:47 +0000 (16:08 +0100)

Trivial merge