Sync'd branch integration/fx-team with upstream @ Thu Sep 18 16:25:44 PDT 2014