Merge "Linux compilation fix"