Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150326-1' into staging