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