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