disclaimer
Merge remote-tracking branch 'origin/graphics'