Merge branch 'master' into lua-status-line