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