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