patch against git 16/07/10