Change-Id: Icd1b0fcb19a0e15279b68059efa6aa251ce806a0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>