Fix for ALOY-245
Merge branch '1_4_X' of https://github.com/appcelerator/alloy into 1_4_X