Resolve CLIMATE-464. Merge PR #73.
Resolve CLIMATE-464. Merge PR #73.

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