Sync'd branch integration/fx-team with upstream @ Tue Sep  2 03:00:32 PDT 2014