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