upstream version 1.0.3