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