Michael Tokarev Tue, 10 Feb 2015 10:58:52 -0800
Applied both to -trivial, with minor commit message wording fix for 1/1. Thanks,
/mjt