Sync'd branch integration/fx-team with upstream @ Thu Sep 18 02:47:37 PDT 2014