Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 15:18:55 PDT 2014