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