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