Sync'd branch integration/fx-team with upstream @ Tue Sep  9 01:45:38 PDT 2014