Master

Tested by Wilson on https://jira.appcelerator.org/browse/TIMOB-16848