Merged stuff for GTK3.10 (Fedora 20) compatibility. Fixes #7