Merge branch 'typedef-func_proto'