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