Sync'd branch integration/fx-team with upstream @ Mon Oct 20 15:21:47 PDT 2014