Fan Zhang authored Nov 18, 2014 and Adam Mercer committed Nov 19, 2014

(cherry picked from commit 29afab16cf4f5c49e1c359771df6aef5467826eb)
Original: 015e74b6e5957f3332a75b298211cb3dd2c02a18