Updated to be current with Bitbucket branch.