Chrome 29 fix - Backport for 4.8.
Chrome 29 Fix - Backport for 4.8
Fixes for Chrome 29 - 4.8 Branch
Merge pull request #259 from mbatchelor/4.8

4.8