Patch for gits slave file
Merge branch 'troy' of github.com:SOLA-SL-FAO/code into troy
Merge branch 'v16' into test
Merge branch 'troy'