Consistent with v3.0.0 of bitbucket. No further commits should be made on this branch.
Updated from master branch on bitbucket