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