Merge "Use exec() rather than execfile()"