Merge branch 'master' into 3605-improved-dashboard
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 12 Sep 2014 19:52:30 +0000 (15:52 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 12 Sep 2014 19:52:30 +0000 (15:52 -0400)

Trivial merge