Merge from master for gperf fixes