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