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