Merge branch 'master' into v4.8.x
authorArun Persaud <arun@nubati.net>
Sat, 11 Oct 2014 17:53:46 +0000 (10:53 -0700)
committerArun Persaud <arun@nubati.net>
Sat, 11 Oct 2014 17:53:46 +0000 (10:53 -0700)

Trivial merge