Merge 3.1 (empty merge, a similar patch was already applied)