Merge pull request #5668 from kumpera/wasm-work-p4
authorRodrigo Kumpera <kumpera@users.noreply.github.com>
Mon, 2 Oct 2017 23:36:39 +0000 (16:36 -0700)
committerGitHub <noreply@github.com>
Mon, 2 Oct 2017 23:36:39 +0000 (16:36 -0700)
More WASM fixes.


Trivial merge