Merge tag 'v3.17-rc5' from upstream
authorBrian Norris <computersforpeace@gmail.com>
Mon, 15 Sep 2014 23:28:16 +0000 (16:28 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Mon, 15 Sep 2014 23:28:16 +0000 (16:28 -0700)

Trivial merge