Merge branch 'testing' of ../git-at-spi