Merge topic 'fix-gtk2-missing-optional-includes'

cb8f0f7c FindGTK2: Fix missing optional include dirs.
Merge branch 'master' into next