fix merge comment, now up to date with spumko master c6c445b