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