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