Sync'd branch integration/fx-team with upstream @ Tue Sep  9 17:18:30 PDT 2014