Removed merge conflict leftovers
Minor bugfix
Taggigng version 7.x-0.32
Merge branch 'release/7.x-0.32'