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