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