Minor changes to test stash.
Merge branch 'master' of https://github.com/amilovac/php5