Merge pull request #125 from DougGregor/export-as-4.1

Cherry-pick changes to support re-exported modules