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