Merge pull request #3393 from kkhoot/fix-reshape
authorJeff Donahue <jeff.donahue@gmail.com>
Tue, 26 Jan 2016 18:01:34 +0000 (10:01 -0800)
committerJeff Donahue <jeff.donahue@gmail.com>
Tue, 26 Jan 2016 18:01:34 +0000 (10:01 -0800)

Trivial merge