Fixed build problem after merge with upstream.