Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 18:18:46 PDT 2014