Sync'd branch integration/b2g-inbound with upstream @ Sun Nov  2 20:48:45 PST 2014