Sync'd branch integration/fx-team with upstream @ Thu Sep  4 14:23:34 PDT 2014