Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 17:19:45 PDT 2014