Fix misnamed comment
Merge remote-tracking branch 'upstream/master'
Update submodules