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