Please Merge https://github.com/apache/climate/pull/486

[Michael Anderson]

Could someone please merge https://github.com/apache/climate/pull/486 when
they have a second?  Conflicts have been addressed.

Thank you,

Michael A. Anderson