Merge branch 'master' into contao-dev
User Agent added
Merge branch 'contao-dev'