Commits in gnote/mainline:master