Merge branch 'master' into 3382-always-show-inputs
authorPhil Hodgson <bitbucket@philhodgson.net>
Mon, 17 Nov 2014 17:16:06 +0000 (18:16 +0100)
committerPhil Hodgson <bitbucket@philhodgson.net>
Mon, 17 Nov 2014 17:16:06 +0000 (18:16 +0100)

Trivial merge