Commit ca55adaa4d754b0b15b19db185bba13123cb960a

Edward Thomson 2018-06-04T12:18:40

Merge pull request #4666 from pks-t/pks/v0.26.4 Release v0.26.4