Final cumulative bug fix for 3.2. Author: Hrvoje Jasak. Merge: Hrvoje Jasak.