Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 23:46:41 PST 2014