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