Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141104-2' into staging