Merge branch 'master' of https://github.com/browscap/browscap into extended-data
Merge branch 'extended-data' of https://github.com/mimmi20/browscap into extended-data
imported from the extended full file