Sync'd branch integration/fx-team with upstream @ Thu Sep 18 04:33:17 PDT 2014