Merged from changes introduced on revno 8681
Removed *.pyc files from repo
Merge branch 'develop'