Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  1 16:21:49 PDT 2014