Add support for non-lazy classes and categories
Merge commit 'e6643f8983302453a1a4026664d53876d11fe78d' into json-export

* commit 'e6643f8983302453a1a4026664d53876d11fe78d':
  Add support for non-lazy classes and categories