Merge pull request #526 from sipa/nl