Sync'd branch integration/fx-team with upstream @ Tue Sep  9 12:45:37 PDT 2014