Sync'd branch integration/fx-team with upstream @ Thu Oct  2 10:18:46 PDT 2014