Merge branch 'master' into devel
Merge pull request #1 from athlan/devel

Merge branch 'master' into devel