[gtk: 2/2] Merge branch 'master' into 'master'

[Marek Kašík <mkasik src gnome org>]

commit cf6f9ad4cf286b4516b11a2f7e56ae84e57c5260
Merge: 0d4ad02353 c6ea37144c
Author: Marek Kašík <mkasik redhat com>
Date:   Thu Apr 4 16:39:18 2019 +0000

    Merge branch 'master' into 'master'
    
    Print dialog, CUPS: Check unknown option values whether they are actually custom settings
    
    See merge request GNOME/gtk!434

 modules/printbackends/gtkprintbackendcups.c | 80 +++++++++++++++++++++++++++--
 1 file changed, 76 insertions(+), 4 deletions(-)
---