Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 15 19:45:46 PDT 2014