3408: Merge branch 'master' into 3408-production-datamanager
authorTom Clegg <tom@curoverse.com>
Tue, 17 Feb 2015 18:46:32 +0000 (13:46 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 17 Feb 2015 18:46:32 +0000 (13:46 -0500)

Trivial merge