Sync'd branch integration/fx-team with upstream @ Wed Oct 22 11:12:14 PDT 2014