Sync'd branch integration/fx-team with upstream @ Tue Sep 30 07:45:41 PDT 2014