Sync'd branch integration/fx-team with upstream @ Wed Sep 24 16:14:41 PDT 2014