Sync'd branch integration/fx-team with upstream @ Wed Sep 24 14:15:42 PDT 2014