Sync'd branch integration/fx-team with upstream @ Tue Sep  2 12:23:37 PDT 2014