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