Upstream version 1.5.11+ds
