Sync'd branch integration/b2g-inbound with upstream @ Mon Nov 10 20:09:00 PST 2014