Merge pull request #4832 from dedeckeh/pr-coap