Merge pull request #1698 from shackbarth/chrome-fix 4_5_x
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Wed, 23 Jul 2014 20:53:37 +0000 (16:53 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Wed, 23 Jul 2014 20:53:37 +0000 (16:53 -0400)
backport chrome fix to 4.5


Trivial merge