Sync'd branch integration/fx-team with upstream @ Wed Oct 29 11:47:36 PDT 2014