port master branch from bitbucket, drop previous commits