Sync'd branch integration/fx-team with upstream @ Thu Sep 25 00:57:42 PDT 2014