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