Fixed php 5.3 parse error
Merge origin/foundation-5 into foundation-5