Sync'd branch integration/b2g-inbound with upstream @ Sun Nov  9 23:53:54 PST 2014