added support for custom WebSocket argument resolution.
Merge remote-tracking branch 'origin/master'