Merge remote-tracking branch 'anarcat/dev/decentralised_graphics'