Timob 1512 3 0 x

backport ticket: https://jira.appcelerator.org/browse/TIMOB-12335