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