Issue #664424 by timbos, roderik, rsevero, aosodoev, Devin Carlson: Cleaned up import.inc and fixed parsing under PHP 5.3.