Merge remote branch 'origin/bugfix/7345_findpeak_exception'
Merge remote branch 'origin/bugfix/7342_rhel6_warnings'
re #7356 correct error in wiki doc
Merge branch 'feature/7356_getei_wiki_error' into develop