Sync'd branch integration/fx-team with upstream @ Wed Oct 15 15:35:41 PDT 2014