Sync'd branch integration/fx-team with upstream @ Wed Oct  1 10:28:41 PDT 2014