Sync'd branch integration/fx-team with upstream @ Thu Sep 18 15:28:39 PDT 2014