[gtk/gtk-3-24] (2 commits) ...Merge branch 'gtk-3-24' into 'gtk-3-24'

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk/gtk-3-24] (2 commits) ...Merge branch 'gtk-3-24' into 'gtk-3-24'
Date: Sun, 3 Jun 2018 23:22:57 +0000 (UTC)

Summary of changes:

  d4feb89... GtkWindow: Handle non-square icons with height > width corr
  83159ff... Merge branch 'gtk-3-24' into 'gtk-3-24'