Sync'd branch integration/fx-team with upstream @ Wed Sep 10 15:41:40 PDT 2014