Sync'd branch integration/fx-team with upstream @ Mon Oct 13 14:01:39 PDT 2014