Sync'd branch integration/fx-team with upstream @ Tue Sep  2 13:34:35 PDT 2014