Upstream changes: 0.78 Tue Dec 2 15:21:30 EST 2014 - Move working code of Inline::import to Inline::import_heavy to support Inline::Module