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