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