Delete an invalid submodule setting
Merge branch 'refs/heads/develop' into dev_cophr