Merge branch 'master' into development
removed MPD-FH branch

(part of new treatment of git branches)
Merge branch 'development'