Timob 17665 stable

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