Merge in add-state-to-oauth2error

Manually merged..
Update version number