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