Merge "g_sans - tool to compute SANS spectra" into release-4-6