Sync'd branch integration/fx-team with upstream @ Wed Sep 24 11:01:38 PDT 2014