Merge branch 'master' into 3408-production-datamanager
authormishaz <misha@curoverse.com>
Tue, 9 Jun 2015 18:00:30 +0000 (18:00 +0000)
committermishaz <misha@curoverse.com>
Tue, 9 Jun 2015 18:00:30 +0000 (18:00 +0000)

Trivial merge