Updated Composer phar & lock file
Merge branch 'php5.4'