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