Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 22 10:49:52 PDT 2014