Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 16:24:38 PDT 2014