Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 10:53:46 PDT 2014