Change-Id: I9749c0c76b810f3d5fee1aa8c5750dac5930cd3c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>