Sync'd branch integration/fx-team with upstream @ Wed Oct  8 11:11:45 PDT 2014