Sync'd branch integration/fx-team with upstream @ Tue Sep 30 12:46:42 PDT 2014