3.1.2 Release
Merge master into md_sandbox