Merge pull request #1 from appcelerator/master

Update to latest master
Bump version to 3.5.0
Merge pull request #6009 from ingo/master

Bump version to 3.5.0