Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 07:18:25 PDT 2014