add a combine_hunks method
Merge branch 'pr/1'
Update build toolchain
Releng for 0.04