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