Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 19:58:47 PDT 2014