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