Yes `merge master` and I think you will find that 567243149d9f39e87ab6264e0e227c2c1bbd5502 supersedes this change.