Merge pull request #618 from tobiasd/20180611-cs