Merge pull request #3837 from b4n/erl-ns