Merge branch 'kvar-master'
Removed legacy line