Simon Quigley authored Sep 30, 2017 and Jeremy Bicha committed Sep 30, 2017

Closes: #851052
Closes: #848838

Note that this doesn't work with Wayland