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