Sync'd branch integration/fx-team with upstream @ Mon Oct  6 11:34:39 PDT 2014