Sync'd branch integration/fx-team with upstream @ Mon Oct 20 01:50:45 PDT 2014