Merge branch 'master' into 'hack-lenovo'