refs #4926 #5072 Merge branch '4926-fix-imagesizes'
authorNancy Ouyang <nancy.ouyang@gmail.com>
Mon, 9 Feb 2015 22:29:47 +0000 (17:29 -0500)
committerNancy Ouyang <nancy.ouyang@gmail.com>
Mon, 9 Feb 2015 22:29:47 +0000 (17:29 -0500)

Trivial merge