Tested with Titanium SDK v3.4.0
Merge branch 'develop'

* develop:
  Tested with Titanium SDK v3.4.0