Merge branch 'hs'