Merge from master after gperf-fixes