Merge branch 'dev'
Version 1.3.2.
Starting version 1.3.3-dev.