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