Bug 848660 - Fix Gaia selector. r=fabrice
Bug 849456 - Fix a potential NULL deref on OOM. r=mrosenberg