Sync'd branch integration/fx-team with upstream @ Wed Oct  8 09:26:45 PDT 2014