Sync'd branch integration/fx-team with upstream @ Tue Sep  2 09:25:33 PDT 2014