Merge pull request #20455 from lygztq/r1.9 upstream/v1.9.0
authorMichael Case <mikecase@google.com>
Mon, 9 Jul 2018 20:38:25 +0000 (13:38 -0700)
committerGitHub <noreply@github.com>
Mon, 9 Jul 2018 20:38:25 +0000 (13:38 -0700)
fix bug in maxout function


Trivial merge