Timob 15126 3 1 x

Testing steps in JIRA: https://jira.appcelerator.org/browse/TIMOB-15126