Sync'd branch integration/b2g-inbound with upstream @ Wed Nov  5 14:04:38 PST 2014