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