Merge pull request #1331 from jamezp/prepare-for-next-version [1328] Initial preparation for 5.0.0-M1 release