added modules parameter
Merge branch 'no-warnings' into switchboard