Merge branch 'master' of https://github.com/browscap/browscap into json-output
Merge branch 'master' of https://github.com/browscap/browscap into json-output
Merge branch 'master' of https://github.com/browscap/browscap into json-output
Merge branch 'json-output' of https://github.com/mimmi20/browscap into json-output-preprocessed