Sync'd branch integration/b2g-inbound with upstream @ Sat Nov  1 11:13:34 PDT 2014