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