Fix an issue introduced in f22007947c3f7761a70fb81a45a1acf9e685d1b3
Merge branch '4.2'