Merge branch 'master' into 4358-graph-not-comparing
authorPhil Hodgson <bitbucket@philhodgson.net>
Sat, 20 Dec 2014 17:58:03 +0000 (18:58 +0100)
committerPhil Hodgson <bitbucket@philhodgson.net>
Sat, 20 Dec 2014 17:58:03 +0000 (18:58 +0100)

Trivial merge