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