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