Sync'd branch integration/fx-team with upstream @ Wed Sep 24 19:26:40 PDT 2014