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