Resolve CLIMATE-457. Merge PR #60.
Resolve CLIMATE-457. Merge PR #60.

riverma/climate,lewismc/climate,riverma/climate,MBoustani/climate,Omkar20895/climate,MJJoyce/climate,jarifibrahim/climate,apache/climate,MJJoyce/climate,apache/climate,huikyole/climate,MBoustani/climate,kwhitehall/climate,agoodm/climate,apache/climate,kwhitehall/climate,apache/climate,agoodm/climate,pwcberry/climate,Omkar20895/climate,lewismc/climate,huikyole/climate,jarifibrahim/climate,kwhitehall/climate,kwhitehall/climate,MJJoyce/climate,Omkar20895/climate,MJJoyce/climate,huikyole/climate,pwcberry/climate,MBoustani/climate,riverma/climate,lewismc/climate,agoodm/climate,pwcberry/climate,Omkar20895/climate,jarifibrahim/climate,riverma/climate,lewismc/climate,jarifibrahim/climate,jarifibrahim/climate,Omkar20895/climate,pwcberry/climate,MBoustani/climate,agoodm/climate,MJJoyce/climate,apache/climate,pwcberry/climate,riverma/climate,agoodm/climate,lewismc/climate,huikyole/climate,MBoustani/climate,huikyole/climate