Merging recent master with applied patch of First Unstable feature
Update version number.  Remove -snapshot because this is on master
Reverting version number