Warning: the windows branch is treated as a local topic branch that just happens to be shared here, so expect non-fast-forward updates...