Merge remote-tracking branch 'origin/master' into feature/7732_Load_Save_Ascii_Multiple_Spectra
Merge remote-tracking branch 'origin/master' into feature/7732_Load_Save_Ascii_Multiple_Spectra
Refs #7732 Fixed Ubuntu compiler warning

Removed a set but unread varable and a redundant else if clause that was causing an ubuntu compiler warning.
Merge branch 'feature/7732_Load_Save_Ascii_Multiple_Spectra' into develop