Version 1.33, w1.1.1
Merge branch 'devel'
Version 1.33, w1.2.0
Merge branch 'devel'
Version 1.33, w1.3.0