Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 02:23:53 PST 2014