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