Sync'd branch integration/fx-team with upstream @ Tue Sep  2 14:30:40 PDT 2014