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