Merge branch 'fix-gnotification-tests' into 'master'