Add statusline overwrite disable variables
Merge branch 'master' into mac