Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Wed, 1 Jun 2016 05:01:21 +0000 (00:01 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 1 Jun 2016 05:01:21 +0000 (00:01 -0500)

Trivial merge