Merge from BitBucket.