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