Sync with MC/trunk


git-svn-id: svn://creme-brulee.marcuscom.com/ports/branches/GNOME_3_12@19940 df743ca5-7f9a-e211-a948-0013205c9059