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