Sync'd branch integration/fx-team with upstream @ Thu Sep 11 15:37:13 PDT 2014