Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 06:50:52 PDT 2014