Remove from/import.
Update to PHP5.4.
Merge branch 'from_import' into incoming