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