Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Plugin reports wrong number of failures Change-Id: Ifdb27b3b3977f430717cfdb03c93cc75489f280a