am 706ab0d0: Merge "Make classes that extend ItemInfo public." into ub-now-mister-ugly

* commit '706ab0d07ada1694de78c573e342f4c64d75d45c':
  Make classes that extend ItemInfo public.