Fixed errors (thanks to linonel-m)
Merge branch '3.2' into 3.3