Sync'd branch integration/fx-team with upstream @ Wed Oct  1 17:25:38 PDT 2014