Sync'd branch integration/fx-team with upstream @ Wed Oct 29 12:49:40 PDT 2014