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