Related to #8516 Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Jonathan Gilbert <jpg@trillica.com>