Merge branch 'tidoc-1899' of https://github.com/bhatfield/titanium_mobile
Merge branch 'master' of https://github.com/appcelerator/titanium_mobile
Merge branch 'master' of https://github.com/appcelerator/titanium_mobile
[TIDOC-1968] Update filterAttribute for platform differences
Merge pull request #6319 from bhatfield/tidoc-1968

[TIDOC-1968] Update filterAttribute for platform differences