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