Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 19:11:48 PST 2014