Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 10 01:53:43 PDT 2014