refs #8381. Nested class causes problems on rhel6.
Merge branch 'feature/8381_python_peaks_presenter' into develop