Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 03:58:46 PDT 2014