[Fix #366] Distinct position with red
Merge remote-tracking branch 'upstream/master'
Update submodules