Merge "Fix build error in gcc 7.2" into eel