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