Merge branch 'master' into 3408-production-datamanager refs #3408
authormishaz <misha@curoverse.com>
Tue, 17 Feb 2015 23:06:32 +0000 (23:06 +0000)
committermishaz <misha@curoverse.com>
Tue, 17 Feb 2015 23:06:32 +0000 (23:06 +0000)

Trivial merge