Merge pull request #5562 from jansupol/m3013b

Merge 3.0 -> 3.1