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