pull comms out state for inspector
Merge remote-tracking branch 'refs/remotes/origin/master' into update-om
compiler doesn't like us using js* anymore
Merge commit 'cb9146ed7c940fdade21893dfeee1efff3b9ca74'