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