Sync'd branch integration/fx-team with upstream @ Wed Oct  8 18:10:42 PDT 2014