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