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