Updates submodules
Merge pull request #1509 from lukecampbell/submods-r2

Updates submodules