[gtk/gtk-2-24] (2 commits) ...Merge branch 'gtk2-icon-fix' into 'gtk-2-24'

From: Benjamin Otte <otte src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk/gtk-2-24] (2 commits) ...Merge branch 'gtk2-icon-fix' into 'gtk-2-24'
Date: Wed, 16 May 2018 12:55:51 +0000 (UTC)

Summary of changes:

  9ce6f80... Fix incorrect optimization in find_builtin_icon().
  48821a7... Merge branch 'gtk2-icon-fix' into 'gtk-2-24'