Merge branch 'master' into 3114-copy-to-project
authorPhil Hodgson <bitbucket@philhodgson.net>
Mon, 11 Aug 2014 16:28:24 +0000 (12:28 -0400)
committerPhil Hodgson <bitbucket@philhodgson.net>
Mon, 11 Aug 2014 16:28:24 +0000 (12:28 -0400)

Trivial merge