Merge in changes from Jakub
Merge branch 'master' of https://github.com/pfps/yoga-laptop

Pull in commits from Buri