Merge remote-tracking branch 'origin/master' into Tom
Now it compiles
Merge remote-tracking branch 'origin/Tom'