Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 6df65db70da5357eabc05e380d9dac91d66ec056, reversing
changes made to 2be6ce2b49cfb8d8c3cf336d3a04c6a09a2719e7.
Version number update