Return main line of development to v1

• This release updates v1 with the latest code and documentation. The small backwards compatibility breaking change will stay in the v2 branch but docs for new v2 releases will recommend staying with v1.