Updating submodules to newly-merged master commits
Merge pull request #361 from khawkins/unstable20

Updating submodules to newly-merged master commits