Starting to experiment with external displays.
Merge remote-tracking branch 'origin/master'