Merge pull request #692 from tobiasd/20180808-nl