Updates for refactored wsinvoke.
Touch
Touch
Touch
Merge branch 'master' of github.com:nickman/apmrouter