Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 18:14:47 PST 2014