Sync'd branch integration/fx-team with upstream @ Mon Oct 20 11:50:48 PDT 2014