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