Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 13:44:51 PST 2014