Need to make sure parent classes get loaded before children.
Merge branch 'master' into i18n