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