Cleaned out merge artifacts from v3.1.0 release.