Sync'd branch integration/b2g-inbound with upstream @ Wed Nov  5 01:57:49 PST 2014