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