Fixed issue with array that was too long. this refs #7924
Changed default value of binning and merged work from q_axis ticket. This refs #7924
Re #7924 Trying to fix Jean's mess
Merge branch '7924_branch_fix' into develop