Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
some code cleaning/refactoring
Merge branch 'master' into develop