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