Merge pull request #559 from teharrison/shock

devel to shock