Get rid of obsolete module initializer.
Merge branch 'develop'