Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 04:06:53 PST 2014