[OUG] Update; thanks DEG!
Merge remote-tracking branch 'upstream/master'