Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 19 Sep 2014 20:42:03 +0000 (16:42 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 19 Sep 2014 20:42:03 +0000 (16:42 -0400)

Trivial merge