Sync'd branch integration/fx-team with upstream @ Wed Sep  3 02:52:35 PDT 2014