Fixed a problem where this caching thing on data objects with multiple DataObjectHierarchyEntry relationships was failing.
Merge branch '2013.04.16' of github.com:EOL/eol into 2013.04.16