No bug - Fix broken merge (976228f4aef7).
Automatic merge