Merge branch 'master' into development
[BUGFIX] error in build 3.2.5
Merge branch 'development'