Fix to facilitate branch merges
1 file changed