Fix missing lines in dialogs.
Merge branch 'master' into v1.6