Missing #include causing XS build to fail. #1349
Merge branch 'master' into new-support2