Merge "Updating StandardNames for recent ARCFOUR and Blowfish additions" into gingerbread