Sync'd branch integration/b2g-inbound with upstream @ Sun Nov  2 21:18:47 PST 2014