update to 0.9.4 from upstream
Merge branch 'upstream'
update test image to new encoding