Update to 3.1 tag

Pulling over updates to the 3.1 tag