Merge pull request #1 from GNOME/master

merge from master