@AndreTurgeon - it looks like this file was missed when you merged from HEAD