Sync'd branch integration/b2g-inbound with upstream @ Sat Nov  1 08:47:59 PDT 2014