Merge pull request #2651 from keir/master
authorJeff Donahue <jeff.donahue@gmail.com>
Tue, 26 Jan 2016 23:34:42 +0000 (15:34 -0800)
committerJeff Donahue <jeff.donahue@gmail.com>
Tue, 26 Jan 2016 23:34:42 +0000 (15:34 -0800)

Trivial merge