Although the PR build "failed", the linux side is fixed. This is an improvement. People might be skipping over it when they see the red "X", but it should be merged. I have more changes to submit following this one. Thanks.

#837