Sync'd branch integration/fx-team with upstream @ Thu Sep 25 12:28:37 PDT 2014