Sync'd branch integration/fx-team with upstream @ Tue Sep  9 15:35:49 PDT 2014