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