Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 22:43:45 PDT 2014