Updated submodule for grin

Make sure to run git submodule sync
Merge branch 'master' into emit-dev