Resolve CLIMATE-397. Merge PR #15.
Resolve CLIMATE-397. Merge PR #15.

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