(upstream git commit 2eb4ed95bcd5f039014db51eb56f0ac411401fa5) See: http://bugs.i3wm.org/report/ticket/915