Merged changes from Go MAEDA patch

Merged changes from redmine commit
bfd811304601edbc3c17edc1259a1029c230726d.