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