Sync'd branch integration/fx-team with upstream @ Wed Sep 24 08:10:38 PDT 2014