Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 22:54:47 PST 2014