[core] bugfix (enbug) Parse error on PHP < 5.3
Merge branch '2.1' into 2.1_n