Merge branch 'testing' of https://github.com/palmin/test.git