Merge pull request #3702 from hauke/libcoap