Merged 1862-show-object-links into master
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 14 Jan 2014 00:50:05 +0000 (19:50 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 14 Jan 2014 00:50:05 +0000 (19:50 -0500)

Trivial merge