Prep 3.1.x to be working branch for bugfixes and patch