Sync'd branch integration/fx-team with upstream @ Wed Oct  1 06:59:43 PDT 2014