Sync'd branch integration/fx-team with upstream @ Mon Oct 13 13:35:42 PDT 2014