Upstream version 3.2-stable