Add mappings for QuickFix
Merge branch 'master' into mac