Sync'd branch integration/fx-team with upstream @ Tue Sep  2 04:41:35 PDT 2014