merge dccc39b to make automerger happy, original change 231cc6 was already merged

Merge commit 'dccc39b'