Update from twitter/commons master

Via  Github web interface. (Hoping this will be right).