merge bitbucket/testbed to github/kasicass