#2905: fix merge glitch on OSX.
1 file changed