This implements #556
Works for me in basic scenarios.
Commit 070f16f6 fixes this pull-request
Pull-Request has been merged by mikem@redhat.com
This implements #556