Merges with origin/master; Drops the module definitions for now.