Updated shimo to use latest.
Merge pull request #4860 from moonray/shimo

Updated shimo to use latest.