3782: Merge branch 'master' into 3782-stub-file-content
authorTom Clegg <tom@curoverse.com>
Wed, 1 Oct 2014 16:08:01 +0000 (12:08 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 1 Oct 2014 16:08:01 +0000 (12:08 -0400)

Trivial merge