Timob 12286 3 0 x

Backport of https://jira.appcelerator.org/browse/TIMOB-12286