Merge "Fixed error message for zwitterion residues" into release-4-6