Timob 17890 3 4 x

https://jira.appcelerator.org/browse/TIMOB-17890