Bug 909201 proposed fix.
Bug 909201 proposed fix.
Merge branch 'master' of https://github.com/rsajdok/gaia into issue#909201