Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 18 Sep 2014 13:30:27 +0000 (09:30 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 18 Sep 2014 13:30:27 +0000 (09:30 -0400)

Trivial merge