Synced to latest from dot_vim