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