Potential fix for trac2533149. Testing indicates this will fix all parse errors in android 2.3.4.
Updated parse method with lsmith's code. Fix #2533149
Merge branch 'trac2533149' into dev-3.x

Merge in fix for json parse regression.