Merge branch 'master' into 3661-copy-move-from-show
authorPhil Hodgson <bitbucket@philhodgson.net>
Thu, 18 Sep 2014 21:07:03 +0000 (17:07 -0400)
committerPhil Hodgson <bitbucket@philhodgson.net>
Thu, 18 Sep 2014 21:07:03 +0000 (17:07 -0400)

Trivial merge