Release 2

Release 2 is ready to be merged.