Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 22 20:53:50 PDT 2014