More module boilerplate.
Removing boilerplate (unneccessary).
Merge remote-tracking branch 'origin/master'