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