Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 10 19:04:45 PDT 2014