Merge branch 'CLIMATE-936' of https://github.com/MichaelArthurAnderson/climate