Merge branch 'master' into 4233-graph-job-stats
authorPhil Hodgson <bitbucket@philhodgson.net>
Tue, 25 Nov 2014 07:30:20 +0000 (08:30 +0100)
committerPhil Hodgson <bitbucket@philhodgson.net>
Tue, 25 Nov 2014 07:30:20 +0000 (08:30 +0100)

Trivial merge