Merge branch 'libcloud_1268' into trunk
authorAnthony Shaw <anthony.p.shaw@gmail.com>
Wed, 19 Dec 2018 05:29:03 +0000 (16:29 +1100)
committerAnthony Shaw <anthony.p.shaw@gmail.com>
Wed, 19 Dec 2018 05:29:03 +0000 (16:29 +1100)
Closes #1268


Trivial merge