Style corrections in stubs files.
Merge branch 'develop' into models