Sync'd branch integration/fx-team with upstream @ Wed Oct 29 16:22:44 PDT 2014