some modules renamed, to avoid possible name collisions.
Merge remote-tracking branch 'origin/master'