merging fix in from 1.4
Fixing syntax error

--HG--
extra : source : 965cf5f3443c16cf35cb664e672273a5478d8b8d
merging master@default