Sync'd branch integration/b2g-inbound with upstream @ Wed Nov  5 11:41:41 PST 2014