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