Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 02:08:50 PDT 2014