Merge branch 'master' into devel
14072014-1920
Merge branch 'devel'