fix build with gtk2
Merge branch 'master' into dev