Merge branch 'master' into v4.8.x
authorArun Persaud <arun@nubati.net>
Fri, 17 Oct 2014 06:14:42 +0000 (23:14 -0700)
committerArun Persaud <arun@nubati.net>
Fri, 17 Oct 2014 06:14:42 +0000 (23:14 -0700)

Trivial merge