Merge IP-Display

Though this isn't technically a merge, I've collected the relevant
changes from the IP-Display branch, and applied them to this branch.