Merge pull request #556 from tobiasd/20180321-nl