Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3' * commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3': Fix build on some linux machines
Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3' * commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3': Fix build on some linux machines