Merge pull request #534 from tobiasd/20180218-en