Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 00:53:45 PDT 2014