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