Sync'd branch integration/b2g-inbound with upstream @ Fri Oct  3 17:53:40 PDT 2014