Sync'd branch integration/fx-team with upstream @ Tue Sep 30 09:38:33 PDT 2014