Merge branch 'master' into 10190_fix_select_icon_and_firefox

This commit is contained in:
Johannes Schill
2017-12-19 14:55:18 +01:00
3 changed files with 4 additions and 0 deletions