Sync'd branch integration/fx-team with upstream @ Wed Sep 17 15:31:40 PDT 2014