Merging 3.1.0 into master