Merge branch 'master' into 3408-production-datamanager
authormishaz <misha@curoverse.com>
Tue, 19 May 2015 17:16:43 +0000 (17:16 +0000)
committermishaz <misha@curoverse.com>
Tue, 19 May 2015 17:16:43 +0000 (17:16 +0000)
Because it's been a long time.


Trivial merge