Merge branch '6638-backport-deps' refs #6638
authorTom Clegg <tom@curoverse.com>
Fri, 14 Aug 2015 21:32:58 +0000 (17:32 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 14 Aug 2015 21:32:58 +0000 (17:32 -0400)

Trivial merge