Check if DISPLAY_IP is defined before using it
Merge remote-tracking branch 'upstream/master'