Change-Id: I9dab955a0b4a0d7d83a69cfc474633be43e7169f Reviewed-by: David Schulz <david.schulz@digia.com>