- fix for missing MOZ_NONHEAP_CLASS definition
- rel 2