Sync'd branch integration/fx-team with upstream @ Wed Sep 24 18:12:40 PDT 2014