Signed-off-by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Uses functionality that was added a month ago for exactly this purpose. Fixes #1237.