New upstream version 0.9.4