Merge branch 'dev-master' into dev-3.x
Major pre version bump.
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x
Version bump.
Update HISTORY versions.
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x
Populate HISTORY files.
Resolve version diffs
Minor pre version bump.
Merge branch 'dev-master' into dev-3.x
Major pre version bump.