Revise conceal setting for under 7.3
Merge branch 'master' into mac