merge stable
authorKevin McCarthy <kevin@8t8.us>
Wed, 27 Apr 2016 20:21:15 +0000 (13:21 -0700)
committerKevin McCarthy <kevin@8t8.us>
Wed, 27 Apr 2016 20:21:15 +0000 (13:21 -0700)

Trivial merge