Commit 2d751c9a77fae21ea027a4f1b823b6d1f552e2bb

Stephen Moloney 2017-03-17T13:13:29

fixes for some of the cloud queries