Sync'd branch integration/b2g-inbound with upstream @ Mon Nov 10 01:58:55 PST 2014