Related to #11775 Signed-off-by: Wouter Born <github@maindrain.net>
Also-by: Jimmy Tanagra <jimmy@tanagra.id.au> Signed-off-by: Brian O'Connell <broconne@gmail.com>