Release 3.2.0

Bugfix and new feature release.

Change-Id: I12dc5fbaaf0d705568449a6297205c47c694d0d5