Merge commit '030d673e455ac7fa92732eafe95f1db12f6a46b6' into 1862-show-object-links
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 13 Jan 2014 15:17:03 +0000 (10:17 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 13 Jan 2014 15:17:03 +0000 (10:17 -0500)

Trivial merge