Daniel Gibbs c7149168ba Merge from master %!s(int64=9) %!d(string=hai) anos
..
cfg 8b74cf5752 Corrected location %!s(int64=9) %!d(string=hai) anos
dstserver c7149168ba Merge from master %!s(int64=9) %!d(string=hai) anos