Merge remote-tracking branch 'origin' into 1692-redesign-dashboard
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 27 Dec 2013 18:36:54 +0000 (13:36 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 27 Dec 2013 18:36:54 +0000 (13:36 -0500)

Trivial merge