bump submodules
Merge remote-tracking branch 'upstream/master'
Merge pull request #281 from wfrench/master

bump submodules