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