3.1.2 Sync

Bringing this repo up to speed with 3.1.2 (next pending release)