Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 05:08:45 PST 2014