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