Sync'd branch integration/b2g-inbound with upstream @ Wed Nov  5 18:22:45 PST 2014