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