Comment # 2 on bug 1021476 from Bj�rn Lie

Adding Felix to CC, setting needinfo.

@SLED team

Patch picked from upstream git, sub acked into G:S:3.20