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