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