Updated docblock
Updated change log and version number
Merge branch 'release/3.2' into develop