Sync'd branch integration/fx-team with upstream @ Tue Sep  2 15:27:30 PDT 2014