Merge pull request #4280 from vargaz/class-init-cond