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