refs #5493: Merge branch '5493-fix-yellow-gif'
authorNancy Ouyang <nancy.ouyang@gmail.com>
Wed, 6 May 2015 21:28:05 +0000 (17:28 -0400)
committerNancy Ouyang <nancy.ouyang@gmail.com>
Wed, 6 May 2015 21:28:05 +0000 (17:28 -0400)

Trivial merge