
        Ported over to the latest incoming. Removed deprecated extern module …

959bd47

…names.