Sync'd branch integration/b2g-inbound with upstream @ Wed Nov  5 10:47:21 PST 2014