Sync'd branch integration/fx-team with upstream @ Mon Oct  6 12:40:39 PDT 2014